Now has mode included