Moved stuff from 4 to 2