Updated for full path