updated combinations and added support for more