added 2 new features