Work more on APR