New changes during Geek Gathering
First dirty solution.