bumped version
abstracted stuff