Added paths; partial imimplementation