Changing this to the long/old way.