Adding new feature to Oleg's Branch