Feature/fchange 3

Changes from fchange-3