Change simple to current for push behavior