Earlier aborted attempt of porting small pt moved in