Did some chnages according to Toms comments