reverted 2 changes / commits because they were wrong