second attempt to fix stuff