Updated drawing + functionality