Fixed stuff by reverted to old state