kinda ready to update