syncing with irina
shortcomings update