Modified to remove find since it's not needed with v0.5