Incorporated Boris' suggestions