Separated the backwards custom policy into separate file
minor changes