Changed appearance to fit my needs