FDVM - Make It right