Added other goodies