commit 15

quase final