+ MODULARIZE as per vimjoyer