merging previous code