fixing issues with last submission