updated for easier use