Ficly

Comments on change part 3. by curq