Reverted back modifications for non-api approach