Merged Daniel's branch with Test branch