Upload source

Version 3 with fixes