updated. making progress