Fixing issues and bugs part 6