Work on remoing necessity to remove all frames and readd them