changed and moved around stuff