Merged changes to old version