Reverted back to previous files due to some issues