Added origin and fixed solutions.