after restructring, basic scripts were checked