fix to be simpler