modify analytics with new lines + litle changes