Final changes from bryce