Bug fix and sandbox mode added