updated and added methods, testing applicaiton