Rebased my code on your original repo