Last feature implemented for development freeze