working but still not the way I want