Solution for #4 and #5