Updated to reflect Elefant best practices