fixed some cusotmization