Commit 4

Fixes in commit 2