Update to fit new project idea