fixing it up more