need some fixes