removed empty line
added support for choices