Forgot to add these 'working' versions before I went ahead and changed
everything. Possible overkill.