moved etc to allow for easier use