merged with maxs stuff