improved for deplyment