cleaned up first problem