changes adapted to new features