more scripts and organization