Updated subscription calculation logic