work from 02/09
second commit
final version before mergining