Multiline issue and $ issue fixed