simplified stuff some more