no big changes
working on capitalization issue, not fixed yet