changed to whole while theme