Major changes, everything should be in line now