Made more universal path