Began adding support for multiple modes