[Update] - update design and bugfixes.