trying a new way and cleaning up code