CE-297 A bit of optimization