made it more basic