with front support, some cleanup and organization