Fixed paths
Updated version