modified a little