removed some complexity