Edited according to 328