added local customizations
added more changes