This version is working properly.