modifications, seems to be stable, time to implement update logic