need to rethink some things