added comments and order