now works with bare bones functionality