Updated scaladin