revised rake tasks