Hamed final fixes