Added some graphics math with locations