Pass done avor Johan's notes