Edited settings for dev because master is dev