Changed a bit

Need to make further fixes.