More Final touches