Work commit. Removed unused parameters.