initial setup modified