Added creation mode (2 pts)