modified a few things