Fixed up app