reorganize and messing stuff up XD