Finished, but it can still be polished part 2