Updates

Please take a quick look.