added some places for support