refactor, last update for a bit