fixed scriptor modularization