changed the last commit to "nicer" syntax