Seems better. Logic bugs fixation on the way...