update after not working on this project for almost an eternity