Change stuff around alot