moved stuff
removed compatabilities