Refactory: continue...