extra methods added and dbugging removed