use generic block for 'Current' data
call super at start of method
remove code after implementing generic code introduced in commit b255c7916db7ce7d5716172bc9247e91ac8f8f5a