minor changes to enable rest stuff"