Changed: cleared implementation up