Finalised app for update v1.0.2