Adding changes as @knolleary requested