Unintentially changed functionality. Reverting.