Updated: More testing