Fixed all issues (messed up code)