reverted back to original without each function