Fixed up sub-framework