Code cleaned... Going to improve ext. events.