Development build 24 febrary

working