admin + some changes from Sir Navarro