added contribution period support