Updated for A1.8

Added some stuff