where we are now (rework)

where we are now (rework)