2d continued

forgot to commit some stuffs