Changed to not use bself in block