graphics added and reworked