[20170130190017] General Improvements