Build 5: Some optimization