Fixing issues and bugs part 3