Adjusted parsing
First steps towards liking