adding GAE and a new look