updated, but needs more work