fixing it up..