Basop added and comments clean up for 1237 changes