Futher updates to app