scope apply improvement