changes to accommodate doorkeeper