Simplified and updated code base.