-- Removed other unsed stuff...