Changes on implementation
Changes