ADDED SUPPORT FOR d800