Changed two of the functions for OG and FR.