improvements on scope applying