some improvement in basic setup