Refactored a bit..