Added needed variables