@sharocko's changes 1&2