Changes in an attempt to fix serial