Ver 0.03. Removed errorneous defs.