Updated code to be the most recent version