Attempt to add grinning's additions