More general and correct paths