merged my code with initial fork of project