merged in changes from FE