some tinkering for jamie