added iron stuff
fixed conflict in home