More updates
Working version