adding changes before merging with danilos code