defensive before merger
forgot qa and dont feel like amending
pre merger commit