Fixed changes which were missing

Re did changes overwritten by my last commit