Added repy mechanism