made code much simple at this point