Input changes from Palman