made small changes, added methods