Original version without build tools