Modified little here and there