old commit method
main method change
commited without fixing the merge conflit from a pull