Bundling all changes done on the plane

@qinweigong 
Ah, saw you are checking that in getter