added loading
added code extraction