started adding customized code