Added Im Here logic but still has location issues