Copied code from scratchbox to repository