Updated to version 2.4 Framework