Crazy changes, fixed pesky bug