added ifs for freestone