Added code that removed for debugging.