simplified the previous thing