initial 2014 changes
remove fire
complete merge