added changes to comply with spec