Slight modification needs to be tested