Started to change thing but reverted back to old system