Feature/fchange 1

Changes from fchange 1