Small fix and Updated setup