updated to work with composer.