added status switcher
merge conflicts