[20170222214356] General Improvements