introduced limitations, closes #4