updated main file, updated prefixes and removed irrelevant code