some missed changes from the last commit