fixed math, need to work on arrow