Changes and improvements, Thanks George Wilson