fixed...need to discuss how we should handle EOS