updated basic setup