Hanil code moved out and few fixes...