finally working! Checked and proper. Maybe some formatting left to be done