Improved design; Updated Grido