renaming, finishing up logic