updated derived classes from FA
solved issue #11