finished debugging and added data