trying to merge and fix stuff