Used better methods