changed up the flow a little