Revamped initialization