Removed hardcoded path
First draft