simplifying this package greatly