some small changes (Assignment Number...)