Second commit to finish all changes