Added some efficiency