changed a lot of things... time to take a break