corrected migration and controllers