cleaned up constant loading