fix issue with orientation change
update
remove status check