Completed without extensions

Extensions to be implemented...