Code

This commit consist of two changes: