Changed few things for visual things