Edited to new settings