Prevent errors on no subs
polished new layout