Switching over to a new FRP implementation. Local changes merged