More improvements =)