Updated code - new features