adding more working stuff