Version 1.1.5 part 2