Edited for #6