Ficly

Comments on change part 1. by curq