Further simplificaiton to prevent errors and use less resources.