Updated my new feature, works as intended now.