Samo branch

Tralalala update