added things from clays commit