Version 1.2

Heavy edit