organized some things more logically