resolved #3 and #4