refactored & refined extras