Updated to be simpler