Slight code modification