Filip's comments implemented