Revert "Fixed all issues (Joseph)"

This reverts commit 3842c50a3679e628bcc7f5e82cc208966b8fcf6d.
Revert "Revert "Fixed all issues (Joseph)""

This reverts commit 9fdc398c168c3fe0306277505ae7775c64ff0b3d.