updated everything into one rb file