add some extras the proper way