Fixed changes to be better