removing some limitations