adding some missing calls. Still not working. :-(