Working version of hw04
Working version of hw04