Reverted back changes - find another way