More work on crdit handling