Graphics stuff added