May changes to make things more reusable