Improve Base form