the changes from last commit do not work correctly