made things more efficient
finalizing changes for now