Better parsing, adjust source