fixed heyLu's issues