Work in fixes. PArt 2