Logan's additions
logan again