Imported JJ's work into mainscene merged