Added RBIs and fixed AVG format