Incorporated suggestions from inc0