Finished adding finesse-mode