Camera fix part 2 thanks to nAa for his changes
Camera fix part 2 add new files