Added my version with good parsing and correct inserting