Revert b3678a5..80ef615

This rolls back to commit b3678a50854baff5259ea12ebbe1ba7432f0c01a.
fixing bugs aw yeah