progress 7

More updates