incorporated previous code