final changes .. ready to building