Refactor to use Frame Controller