final commits for Sunday :)