-- Removed dubug messages