update for new code of awesomeness