Updated to work with FRK

First Update