more of less cleaned up