Updated to current development