Added chanegs after talking to Stas/Yannis