integrating felix's frontend changes