Fixing bugs in attempt 1