Added video support and removed compass