changes so far (may need to be reverted)