#51 changes