Bedtime Commit

Fixed a weird bug too, ignore the previous commit, it doesn't work