Attempting to comply with various PEPs