Greg fixes dec 08