auto extend and include mechanism updated! :)
new logic for extensions