made it more flexible