Updated for a more goish style