Added beter extended Q