Changed to be slightly more proper