further simplified things