updated for linux32bit arch on my second laptop
merging errors