Removed some complexity