Finished up porting of 1.5 to 1.6...